merge trunk
authorKenichi Handa <handa@m17n.org>
Fri, 30 Dec 2011 08:51:48 +0000 (17:51 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 30 Dec 2011 08:51:48 +0000 (17:51 +0900)

Trivial merge